[ML] Refactor OpenAI to use ConstructingObjectParser and consolidate class locations #124380
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jonathan-buttner
added
>non-issue
:ml
jonathan-buttner
commented
Mar 7, 2025
| ensureExpectedToken(XContentParser.Token.START_OBJECT, token, jsonParser); | ||
|
|
||
| positionParserAtTokenAfterField(jsonParser, "choices", FAILED_TO_FIND_FIELD_TEMPLATE); | ||
| try (var p = XContentFactory.xContent(XContentType.JSON).createParser(XContentParserConfiguration.EMPTY, response.body())) { |
Contributor
Author
There was a problem hiding this comment.
The major changes here are to use the ConstructingObjectParser instead of iterating by token.
| @@ -0,0 +1,107 @@ | |||
| /* | |||
Contributor
Author
There was a problem hiding this comment.
This class was moved and transitioned to use the ConstructingObjectParser.
| @@ -1,110 +0,0 @@ | |||
| /* | |||
Contributor
Author
There was a problem hiding this comment.
This was moved to external.openai and transitioned to use the ConstructingObjectParser.
| action.execute(new DocumentsOnlyInput(List.of("abc")), InferenceAction.Request.DEFAULT_TIMEOUT, listener); | ||
|
|
||
| var failureCauseMessage = "Failed to find required field [data] in OpenAI embeddings response"; | ||
| var failureCauseMessage = "Required [data]"; |
Contributor
Author
There was a problem hiding this comment.
If we encounter a parsing failure where a field is missing, the error message will be decorated on the way back in one of the upstream listeners. The error message will have the openai information included elsewhere.
| var failureCauseMessage = "Required [choices]"; | ||
| var thrownException = expectThrows(ElasticsearchStatusException.class, () -> listener.actionGet(TIMEOUT)); | ||
| assertThat( | ||
| thrownException.getMessage(), |
Contributor
Author
There was a problem hiding this comment.
Here's an example of the message containing openai and chat completions information already.
Collaborator
|
Pinging @elastic/ml-core (Team:ML) |
prwhelan
approved these changes
Mar 10, 2025
Collaborator
💚 Backport successful
|
jonathan-buttner
added a commit
to jonathan-buttner/elasticsearch
that referenced
this pull request
Mar 11, 2025
…class locations (elastic#124380) * Switching openai to ConstructingObjectParser * Moving files * Fixing package errors
albertzaharovits
pushed a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Mar 13, 2025
…class locations (elastic#124380) * Switching openai to ConstructingObjectParser * Moving files * Fixing package errors
jfreden
pushed a commit
to jfreden/elasticsearch
that referenced
this pull request
Mar 13, 2025
…class locations (elastic#124380) * Switching openai to ConstructingObjectParser * Moving files * Fixing package errors
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR refactors the OpenAI response parsing logic.
external.openai